From 41110a06381037cc67fa0a7b8b68b33b6a95d53a Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Fri, 29 Aug 2008 19:12:56 +0000
Subject: [PATCH] clean up addLinkObj()

---
 includes/LinkCache.php | 50 ++++++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/includes/LinkCache.php b/includes/LinkCache.php
index 5666193759..d3cafacf3c 100644
--- a/includes/LinkCache.php
+++ b/includes/LinkCache.php
@@ -80,7 +80,7 @@ class LinkCache {
 
 	public function addBadLinkObj( $title ) {
 		$dbkey = $title->getPrefixedDbKey();
-		if ( ! $this->isBadLink( $dbkey ) ) {
+		if ( !$this->isBadLink( $dbkey ) ) {
 			$this->mBadLinks[$dbkey] = 1;
 		}
 	}
@@ -120,27 +120,24 @@ class LinkCache {
 	 */
 	public function addLinkObj( &$nt, $len = -1, $redirect = NULL ) {
 		global $wgAntiLockFlags, $wgProfiler;
+		wfProfileIn( __METHOD__ );
 
-		$title = $nt->getPrefixedDBkey();
-		if ( $this->isBadLink( $title ) ) { return 0; }
-		$id = $this->getGoodLinkID( $title );
-		if ( 0 != $id ) { return $id; }
-
-		$fname = 'LinkCache::addLinkObj';
-		if ( isset( $wgProfiler ) ) {
-			$fname .= ' (' . $wgProfiler->getCurrentSection() . ')';
+		$key = $nt->getPrefixedDBkey();
+		if ( $this->isBadLink( $key ) ) {
+			wfProfileOut( __METHOD__ );
+			return 0;
+		}
+		$id = $this->getGoodLinkID( $key );
+		if ( $id != 0 ) {
+			wfProfileOut( __METHOD__ );
+			return $id;
 		}
 
-		wfProfileIn( $fname );
-
-		$ns = $nt->getNamespace();
-		$t = $nt->getDBkey();
-
-		if ( '' == $title ) {
-			wfProfileOut( $fname );
+		if ( $key === '' ) {
+			wfProfileOut( __METHOD__ );
 			return 0;
 		}
-
+		
 		# Some fields heavily used for linking...
 		if ( $this->mForUpdate ) {
 			$db = wfGetDB( DB_MASTER );
@@ -156,19 +153,24 @@ class LinkCache {
 
 		$s = $db->selectRow( 'page', 
 			array( 'page_id', 'page_len', 'page_is_redirect' ),
-			array( 'page_namespace' => $ns, 'page_title' => $t ),
-			$fname, $options );
+			array( 'page_namespace' => $nt->getNamespace(), 'page_title' => $nt->getDBkey() ),
+			__METHOD__, $options );
 		# Set fields...
-		$id = $s ? $s->page_id : 0;
-		$len = $s ? $s->page_len : -1;
-		$redirect = $s ? $s->page_is_redirect : 0;
+		if ( $s !== false ) {
+			$id = $s->page_id;
+			$len = $s->page_len;
+			$redirect = $s->page_is_redirect;
+		} else {
+			$len = -1;
+			$redirect = 0;
+		}
 
-		if( 0 == $id ) {
+		if ( $id == 0 ) {
 			$this->addBadLinkObj( $nt );
 		} else {
 			$this->addGoodLinkObj( $id, $nt, $len, $redirect );
 		}
-		wfProfileOut( $fname );
+		wfProfileOut( __METHOD__ );
 		return $id;
 	}
 
-- 
2.20.1